From b17855e67b18eb0e43b6f50ee8d8fc8222aadc61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Tue, 13 Nov 2012 23:06:21 +0100 Subject: [PATCH] Michael Henning Clean up babl_process_chunks a bit. --- babl/babl-fish-path.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c index 7c1a87b..f7ab32a 100644 --- a/babl/babl-fish-path.c +++ b/babl/babl-fish-path.c @@ -25,6 +25,8 @@ #define BABL_HARD_MAX_PATH_LENGTH 8 #define BABL_MAX_NAME_LEN 1024 +#define MIN(a, b) (((a) > (b)) ? (b) : (a)) + #define NUM_TEST_PIXELS 3072 int babl_in_fish_path = 0; @@ -407,7 +409,7 @@ babl_process_chunks (const Babl *cbabl, source_bpp = babl_source->type.bits / 8; break; default: - fprintf (stderr, "=eeek{%i}\n", babl_source->instance.class_type - BABL_MAGIC); + babl_log ("=eeek{%i}\n", babl_source->instance.class_type - BABL_MAGIC); } switch (babl_dest->instance.class_type) @@ -419,7 +421,7 @@ babl_process_chunks (const Babl *cbabl, dest_bpp = babl_dest->type.bits / 8; break; default: - fprintf (stderr, "-eeek{%i}\n", babl_dest->instance.class_type - BABL_MAGIC); + babl_log ("-eeek{%i}\n", babl_dest->instance.class_type - BABL_MAGIC); } babl_assert (source_bpp); @@ -427,14 +429,12 @@ babl_process_chunks (const Babl *cbabl, for (i = 0; i < n; i += MAX_BUFFER_SIZE) { - long c; - if (i + MAX_BUFFER_SIZE <= n) - c = MAX_BUFFER_SIZE; - else - c = n - i; - - babl_process (cbabl, source + (i * source_bpp), - destination + (i * dest_bpp), c); + long c = MIN (n - i, MAX_BUFFER_SIZE); + + babl->fish.processings++; + babl->fish.pixels += + babl_fish_process (babl, source + (i * source_bpp), + destination + (i * dest_bpp), c); } return n; } -- 2.30.2